Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 28 May 2011 03:36:30 +0000 (20:36 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 28 May 2011 03:36:30 +0000 (20:36 -0700)

Trivial merge